From: Gert Wollny Date: Mon, 6 Aug 2018 11:50:16 +0000 (+0200) Subject: d/* correct by running 'git fix dpkg' X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~209 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=c73a24bb8e43df67f27bd585ca947bcfb2e17d14;p=dcmtk.git d/* correct by running 'git fix dpkg' --- diff --git a/debian/control b/debian/control index ad5fd1d4..8229e57d 100644 --- a/debian/control +++ b/debian/control @@ -18,9 +18,9 @@ Build-Depends: cmake, zlib1g-dev Build-Depends-Indep: doxygen, graphviz -Standards-Version: 4.1.0 -Vcs-Browser: https://anonscm.debian.org/git/debian-med/dcmtk.git -Vcs-Git: https://anonscm.debian.org/git/debian-med/dcmtk.git +Standards-Version: 4.1.5 +Vcs-Browser: https://salsa.debian.org/med-team/dcmtk +Vcs-Git: https://salsa.debian.org/med-team/dcmtk.git Homepage: http://dicom.offis.de/dcmtk Package: dcmtk diff --git a/debian/copyright b/debian/copyright index e1337325..5da8680f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: DCMTK Upstream-Contact: DCMTK Team Source: https://github.com/commontk/DCMTK @@ -169,8 +169,8 @@ Comment: The code for the interpolatePixel() image scaling algorithm in module Files: ofstd/libsrc/ofstd.cc Copyright: 2001-2017 OFFIS e.V. 1998 Todd C. Miller - 1988 Regents of the University of California - 1999 Bob Withers + 1988 Regents of the University of California + 1999 Bob Withers License: OFFISeV Files: oflog/* @@ -197,30 +197,29 @@ License: BSD-2-clause (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - Files: oflog/include/dcmtk/oflog/config/macosx.h Copyright: 2003-2010 Christopher R. Bailey -License: Apache-2.0 +License: Apache-2.0 Files: oflog/include/dcmtk/oflog/windebap.h oflog/libsrc/windebap.cc Copyright: 2003-2010 Eduardo Francos, Odalio SARL -License: Apache-2.0 +License: Apache-2.0 Files: oflog/libsrc/clogger.cc oflog/include/dcmtk/oflog/clogger.h Copyright: 2011 Jens Rehsack and Tad E. Smith -License: Apache-2.0 +License: Apache-2.0 Files: oflog/include/dcmtk/oflog/ntelogap.h oflog/libsrc/ntelogap.cc Copyright: 2003-2010 Michael CATANZARITI -License: Apache-2.0 +License: Apache-2.0 Files: oflog/include/dcmtk/oflog/log4judp.h oflog/libsrc/log4judp.cc Copyright: 2012 Siva Chandran P -License: Apache-2.0 +License: Apache-2.0 Files: config/stdcxx.m4 Copyright: 2008 Benjamin Kosnik @@ -236,7 +235,7 @@ License: stdcxx-m4 and this notice are preserved. This file is offered as-is, without any warranty. -Files: oflog/include/dcmtk/oflog/appender.h +Files: oflog/include/dcmtk/oflog/appender.h oflog/include/dcmtk/oflog/config/win32.h oflog/include/dcmtk/oflog/configrt.h oflog/include/dcmtk/oflog/consap.h @@ -310,7 +309,7 @@ Files: oflog/include/dcmtk/oflog/appender.h oflog/libsrc/unixsock.cc oflog/libsrc/winsock.cc Copyright: 2001-2010 Tad E. Smith -License: Apache-2.0 +License: Apache-2.0 Files: oflog/include/dcmtk/oflog/tracelog.h oflog/libsrc/logmacro.cc @@ -321,9 +320,8 @@ Files: dcmjpls/libcharls/* Copyright: 2007-2010, Jan de Vaan License: BSD-3-clause - Files: ofstd/tests/tstring.cc -Copyright: 1997-2011, OFFIS e.V. +Copyright: 1997-2011, OFFIS e.V. 1994 Free Software Foundation License: GPL-2.0+ All rights reserved. See COPYRIGHT file for details. @@ -355,8 +353,8 @@ License: GPL-2.0+ Files: debian/* Copyright: 2005-2011 Juergen Salk on 2011-2014 Mathieu Malaterre - 2014-2015 Andreas Tille - 2015-2016 Gert Wollny + 2014-2015 Andreas Tille + 2015-2016 Gert Wollny License: BSD-3-clause Files: ofstd/include/dcmtk/ofstd/ofxml.h @@ -428,7 +426,7 @@ Files: dcmrt/libsrc/drmdose.cc Copyright: 2012-2015, OFFIS e.V. License: OFFISeV -Files: dcmrt/include/dcmtk/dcmrt/drmimage.h +Files: dcmrt/include/dcmtk/dcmrt/drmimage.h dcmrt/tests/tests.cc Copyright: 2012-2016, OFFIS e.V. License: OFFISeV @@ -452,37 +450,21 @@ Files: dcmfg/include/dcmtk/dcmfg/fgframeanatomy.h Copyright: Copyright (C) 2017, Open Connections GmbH License: OFFISeV -License: OFFISeV - This software and supporting documentation were developed by - . - OFFIS e.V. - R&D Division Health - Escherweg 2 - 26121 Oldenburg, Germany +License: Apache-2.0 + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at . - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - Neither the name of OFFIS nor the names of its contributors may be - used to endorse or promote products derived from this software - without specific prior written permission. + http://www.apache.org/licenses/LICENSE-2.0 . - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + . + On Debian GNU/Linux systems you can find this license under + /usr/share/common-licenses/Apache-2.0 License: BSD-3-clause Redistribution and use in source and binary forms, with or without @@ -507,22 +489,6 @@ License: BSD-3-clause OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -License: Apache-2.0 - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - . - http://www.apache.org/licenses/LICENSE-2.0 - . - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - . - On Debian GNU/Linux systems you can find this license under - /usr/share/common-licenses/Apache-2.0 - License: BSD-3-clause-Riesmeier Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: @@ -549,3 +515,35 @@ License: BSD-3-clause-Riesmeier CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: OFFISeV + This software and supporting documentation were developed by + . + OFFIS e.V. + R&D Division Health + Escherweg 2 + 26121 Oldenburg, Germany + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + - Neither the name of OFFIS nor the names of its contributors may be + used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/debian/patches/02_system_charls.patch b/debian/patches/02_system_charls.patch index 2d31a023..d3e05a74 100644 --- a/debian/patches/02_system_charls.patch +++ b/debian/patches/02_system_charls.patch @@ -1,8 +1,7 @@ Description: Remove convenient copy of CharLS -Author: Mathieu Malaterre -Bug-Debian: http://bugs.debian.org/705923 +Bug-Debian: https://bugs.debian.org/705923 Forwarded: no - +Author: Mathieu Malaterre --- a/dcmjpls/CMakeLists.txt +++ b/dcmjpls/CMakeLists.txt @@ -2,6 +2,6 @@ diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch index b2dd8f7f..b6678baf 100644 --- a/debian/patches/03_datadic_install.patch +++ b/debian/patches/03_datadic_install.patch @@ -1,8 +1,7 @@ Description: Install dict to versioned dir -Author: Mathieu Malaterre -Bug-Debian: http://bugs.debian.org/709123 +Bug-Debian: https://bugs.debian.org/709123 Forwarded: no - +Author: Mathieu Malaterre --- a/CMake/GenerateDCMTKConfigure.cmake +++ b/CMake/GenerateDCMTKConfigure.cmake @@ -134,10 +134,10 @@ diff --git a/debian/patches/05_performance.patch b/debian/patches/05_performance.patch index 70048273..2b8a9f43 100644 --- a/debian/patches/05_performance.patch +++ b/debian/patches/05_performance.patch @@ -1,9 +1,8 @@ +Description: Fix a DCMTK performance problem + Forwarded-Upstream: yes +Bug-Debian: https://bugs.debian.org/785400 Author: Sebastien Jodogne Last-Update: Fri, 15 May 2015 16:39:01 UTC -Bug-Debian: http://bugs.debian.org/785400 -Forwarded-Upstream: yes -Description: Fix a DCMTK performance problem - --- a/dcmnet/libsrc/dul.cc +++ b/dcmnet/libsrc/dul.cc @@ -1862,7 +1862,7 @@ diff --git a/debian/patches/07_dont_export_all_executables.patch b/debian/patches/07_dont_export_all_executables.patch index 0bdbe79c..a983d3cb 100644 --- a/debian/patches/07_dont_export_all_executables.patch +++ b/debian/patches/07_dont_export_all_executables.patch @@ -4,9 +4,8 @@ Description: Don't add executables to cmake exports these executables and also dosn't install the test executables, this import may fail leading to failure to configure the according package. +Bug-Debian: https://bugs.debian.org/803304 Author: Gert Wollny -Bug-Debian: http://bugs.debian.org/803304 - --- a/CMake/dcmtkMacros.cmake +++ b/CMake/dcmtkMacros.cmake @@ -55,11 +55,11 @@